---
id: TASK-037
title: Merge-conflict marker highlighting in the editor
status: "\U0001F3C1 Done"
assignee: []
created_date: '2026-07-05 03:51'
updated_date: '2026-07-05 04:04'
labels:
  - feature
dependencies: []
priority: medium
ordinal: 36000
---

## Description

<!-- SECTION:DESCRIPTION:BEGIN -->
When a file has git conflict markers (<<<<<<< HEAD / ======= / >>>>>>> branch, plus ||||||| base for diff3), highlight the marker lines in bold and tint the two version blocks in slightly different background colors. Implemented as a post-pass over scanned spans in buildVisual so it applies to both prose (.md/.txt) and code files. Adds ConflictMarker/ConflictOurs/ConflictTheirs theme colors.
<!-- SECTION:DESCRIPTION:END -->

## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 Conflict marker lines (<<<<<<<, |||||||, =======, >>>>>>>) render bold in a distinct color
- [ ] #2 The 'ours' and 'theirs' blocks between markers get slightly different background tints
- [ ] #3 Markers only detected inside a conflict block (no false hits on setext ===== or ==highlight==)
- [ ] #4 Works in both prose and code files; markup-visible invariant preserved
<!-- AC:END -->